From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Sat, 8 Jun 2013 16:59:20 +0000 (+0200)
Subject: ScreenShield: don't create an unlock dialog if the screen is not locked
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3800
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=1b8580f12b4e704076388240409ca3ecdacd5288;p=gnome-shell.git

ScreenShield: don't create an unlock dialog if the screen is not locked

Creating the unlock dialog starts the GDM conversation and activates
the fingerprint sensors, so don't do it unless necessary.

https://bugzilla.gnome.org/show_bug.cgi?id=697833
---

diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 4776333ff..b5e274347 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -622,7 +622,8 @@ const ScreenShield = new Lang.Class({
         if (!isEnter && !(GLib.unichar_isprint(unichar) || symbol == Clutter.KEY_Escape))
             return false;
 
-        if (this._ensureUnlockDialog(true, true) &&
+        if (this._isLocked &&
+            this._ensureUnlockDialog(true, true) &&
             GLib.unichar_isgraph(unichar))
             this._dialog.addCharacter(unichar);